Auto merge of #1785 - kennytm:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 5 Jul 2015 18:01:28 +0000 (18:01 +0000)
committerbors <bors@rust-lang.org>
Sun, 5 Jul 2015 18:01:28 +0000 (18:01 +0000)

Trivial merge